Remove triple detection from cmake. This isn't actually used for anything, and is broken on Darwin (currently causing build failures now that the triple is passed to aid cross compiling). Rather than fix unused code, just remove it. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@226243 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/CMakeLists.txt b/CMakeLists.txt index 51d9958..e9baceb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -85,21 +85,6 @@ # Configure System #=============================================================================== -# Get triples. -include(GetTriple) -get_host_triple(LIBCXX_HOST_TRIPLE - LIBCXX_HOST_ARCH - LIBCXX_HOST_VENDOR - LIBCXX_HOST_OS - ) -set(LIBCXX_HOST_TRIPLE ${LIBCXX_HOST_TRIPLE} CACHE STRING "Host triple.") -get_target_triple(LIBCXX_TARGET_TRIPLE - LIBCXX_TARGET_ARCH - LIBCXX_TARGET_VENDOR - LIBCXX_TARGET_OS - ) -set(LIBCXX_TARGET_TRIPLE ${LIBCXX_TARGET_TRIPLE} CACHE STRING "Target triple.") - set(LIBCXX_COMPILER ${CMAKE_CXX_COMPILER}) set(LIBCXX_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(LIBCXX_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) @@ -279,7 +264,8 @@ endif() endif() -list(APPEND LIBCXX_CXX_FLAGS "-target ${LIBCXX_TARGET_TRIPLE}") +append_if(LIBCXX_CXX_FLAGS LIBCXX_TARGET_TRIPLE + "-target ${LIBCXX_TARGET_TRIPLE}") append_if(LIBCXX_CXX_FLAGS LIBCXX_SYSROOT "--sysroot ${LIBCXX_SYSROOT}") append_if(LIBCXX_CXX_FLAGS LIBCXX_GCC_TOOLCHAIN "-gcc-toolchain ${LIBCXX_GCC_TOOLCHAIN}") 